Don't close the dialog on focus out of the size entry. (#143505, David

2004-06-02  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
	close the dialog on focus out of the size entry.  (#143505,
	David Hawthorne)

diff --git a/ChangeLog b/ChangeLog
index be79db548c511e30f769efab89d4ed46ff490de0..0e85b6a8dbab3e1a903e46e49284e46bc0e91d52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
+       close the dialog on focus out of the size entry.  (#143505, 
+       David Hawthorne)
+
 2004-06-02  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #138807.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index be79db548c511e30f769efab89d4ed46ff490de0..0e85b6a8dbab3e1a903e46e49284e46bc0e91d52 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-06-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
+       close the dialog on focus out of the size entry.  (#143505, 
+       David Hawthorne)
+
 2004-06-02  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #138807.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index be79db548c511e30f769efab89d4ed46ff490de0..0e85b6a8dbab3e1a903e46e49284e46bc0e91d52 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-06-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
+       close the dialog on focus out of the size entry.  (#143505, 
+       David Hawthorne)
+
 2004-06-02  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #138807.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index be79db548c511e30f769efab89d4ed46ff490de0..0e85b6a8dbab3e1a903e46e49284e46bc0e91d52 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-06-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfontsel.c (gtk_font_selection_size_focus_out): Don't
+       close the dialog on focus out of the size entry.  (#143505, 
+       David Hawthorne)
+
 2004-06-02  Federico Mena Quintero  <federico@ximian.com>
 
        Fix #138807.

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index a59ce09e5ce102eae2e7055bcf27f78a2995123a..64c7b312d0888821797462c57a8b610848ee5a4e 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -998,7 +998,16 @@ gtk_font_selection_size_focus_out (GtkWidget     *w,
                                   GdkEventFocus *event,
                                   gpointer       data)
 {
-  gtk_font_selection_size_activate (w, data);
+  GtkFontSelection *fontsel;
+  gint new_size;
+  const gchar *text;
+  
+  fontsel = GTK_FONT_SELECTION (data);
+
+  text = gtk_entry_get_text (GTK_ENTRY (fontsel->size_entry));
+  new_size = MAX (0.1, atof (text) * PANGO_SCALE + 0.5);
+
+  gtk_font_selection_set_size (fontsel, new_size);
   
   return TRUE;
 }